From: Kim F. Storm <storm@cua.dk>
Date: Mon, 5 Apr 2004 22:03:26 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23341
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c82df39c85072cdbaedb2f8cfd2aa0be612d9074;p=emacs.git

*** empty log message ***
---

diff --git a/etc/NEWS b/etc/NEWS
index b534cbff324..879938761ab 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2472,7 +2472,7 @@ file, you can put a `coding:' tags to override it.)
 ** The new function `merge-coding-systems' fills in unspecified aspects
 of one coding system from another coding system.
 
----
++++
 ** The variable `safe-local-eval-forms' specifies a list of forms that
 are ok to evaluate when they appear in an `eval' local variables
 specification.  Normally Emacs asks for confirmation before evaluating
diff --git a/src/ChangeLog b/src/ChangeLog
index 2e8d731256d..32b68b08d36 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
 2004-04-06  Kim F. Storm  <storm@cua.dk>
 
+	* msdos.c (clear_mouse_face): Only clear mouse highlight if not	hidden.
+	(dos_rawgetc): Set mouse_face_hidden after clearing highlight.
+
+	* w32term.c (w32_read_socket): Set mouse_face_hidden after
+	clearing highlight.
+
+	* xdisp.c (clear_mouse_face): Only clear mouse highlight if not hidden.
+
+	* xterm.c (handle_one_xevent): Set mouse_face_hidden after
+	clearing highlight.
+
 	* indent.c (vmotion): Do not reserve one column for continuation
 	marks on window frames.